Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 8 May 2007 09:32:38 +0000 (10:32 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 8 May 2007 09:32:38 +0000 (10:32 +0100)

Trivial merge